From 7a181cf52b951103b4037d0d7443c739250c85d0 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Sun, 25 Nov 2001 22:19:22 +0000 Subject: [PATCH] free font_desc when finished (#65266) Sun Nov 25 23:18:39 2001 Kristian Rietveld * gtk/gtktexttag.c (gtk_text_tag_set_property): free font_desc when finished (#65266) Sun Nov 25 23:16:29 2001 Kristian Rietveld * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): free data after we set the property. (#65264) Sun Nov 25 23:14:06 2001 Kristian Rietveld * gtk/gtkbutton.c: add destroy method so label_text gets freed if it has been allocated (#65268) --- ChangeLog | 15 +++++++++++++++ ChangeLog.pre-2-0 | 15 +++++++++++++++ ChangeLog.pre-2-10 | 15 +++++++++++++++ ChangeLog.pre-2-2 | 15 +++++++++++++++ ChangeLog.pre-2-4 | 15 +++++++++++++++ ChangeLog.pre-2-6 | 15 +++++++++++++++ ChangeLog.pre-2-8 | 15 +++++++++++++++ gdk/x11/gdkwindow-x11.c | 2 ++ gtk/gtkbutton.c | 17 +++++++++++++++++ gtk/gtktexttag.c | 2 ++ 10 files changed, 126 insertions(+) diff --git a/ChangeLog b/ChangeLog index 905d7ef225..4d9efbf02a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Sun Nov 25 23:18:39 2001 Kristian Rietveld + + * gtk/gtktexttag.c (gtk_text_tag_set_property): free font_desc + when finished (#65266) + +Sun Nov 25 23:16:29 2001 Kristian Rietveld + + * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): free + data after we set the property. (#65264) + +Sun Nov 25 23:14:06 2001 Kristian Rietveld + + * gtk/gtkbutton.c: add destroy method so label_text gets freed + if it has been allocated (#65268) + Sat Nov 24 13:39:51 2001 Manish Singh * gdk/linux-fb/gdkdrawable-fb2.c diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 905d7ef225..4d9efbf02a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,18 @@ +Sun Nov 25 23:18:39 2001 Kristian Rietveld + + * gtk/gtktexttag.c (gtk_text_tag_set_property): free font_desc + when finished (#65266) + +Sun Nov 25 23:16:29 2001 Kristian Rietveld + + * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): free + data after we set the property. (#65264) + +Sun Nov 25 23:14:06 2001 Kristian Rietveld + + * gtk/gtkbutton.c: add destroy method so label_text gets freed + if it has been allocated (#65268) + Sat Nov 24 13:39:51 2001 Manish Singh * gdk/linux-fb/gdkdrawable-fb2.c diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 905d7ef225..4d9efbf02a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,18 @@ +Sun Nov 25 23:18:39 2001 Kristian Rietveld + + * gtk/gtktexttag.c (gtk_text_tag_set_property): free font_desc + when finished (#65266) + +Sun Nov 25 23:16:29 2001 Kristian Rietveld + + * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): free + data after we set the property. (#65264) + +Sun Nov 25 23:14:06 2001 Kristian Rietveld + + * gtk/gtkbutton.c: add destroy method so label_text gets freed + if it has been allocated (#65268) + Sat Nov 24 13:39:51 2001 Manish Singh * gdk/linux-fb/gdkdrawable-fb2.c diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 905d7ef225..4d9efbf02a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,18 @@ +Sun Nov 25 23:18:39 2001 Kristian Rietveld + + * gtk/gtktexttag.c (gtk_text_tag_set_property): free font_desc + when finished (#65266) + +Sun Nov 25 23:16:29 2001 Kristian Rietveld + + * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): free + data after we set the property. (#65264) + +Sun Nov 25 23:14:06 2001 Kristian Rietveld + + * gtk/gtkbutton.c: add destroy method so label_text gets freed + if it has been allocated (#65268) + Sat Nov 24 13:39:51 2001 Manish Singh * gdk/linux-fb/gdkdrawable-fb2.c diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 905d7ef225..4d9efbf02a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,18 @@ +Sun Nov 25 23:18:39 2001 Kristian Rietveld + + * gtk/gtktexttag.c (gtk_text_tag_set_property): free font_desc + when finished (#65266) + +Sun Nov 25 23:16:29 2001 Kristian Rietveld + + * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): free + data after we set the property. (#65264) + +Sun Nov 25 23:14:06 2001 Kristian Rietveld + + * gtk/gtkbutton.c: add destroy method so label_text gets freed + if it has been allocated (#65268) + Sat Nov 24 13:39:51 2001 Manish Singh * gdk/linux-fb/gdkdrawable-fb2.c diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 905d7ef225..4d9efbf02a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,18 @@ +Sun Nov 25 23:18:39 2001 Kristian Rietveld + + * gtk/gtktexttag.c (gtk_text_tag_set_property): free font_desc + when finished (#65266) + +Sun Nov 25 23:16:29 2001 Kristian Rietveld + + * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): free + data after we set the property. (#65264) + +Sun Nov 25 23:14:06 2001 Kristian Rietveld + + * gtk/gtkbutton.c: add destroy method so label_text gets freed + if it has been allocated (#65268) + Sat Nov 24 13:39:51 2001 Manish Singh * gdk/linux-fb/gdkdrawable-fb2.c diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 905d7ef225..4d9efbf02a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,18 @@ +Sun Nov 25 23:18:39 2001 Kristian Rietveld + + * gtk/gtktexttag.c (gtk_text_tag_set_property): free font_desc + when finished (#65266) + +Sun Nov 25 23:16:29 2001 Kristian Rietveld + + * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): free + data after we set the property. (#65264) + +Sun Nov 25 23:14:06 2001 Kristian Rietveld + + * gtk/gtkbutton.c: add destroy method so label_text gets freed + if it has been allocated (#65268) + Sat Nov 24 13:39:51 2001 Manish Singh * gdk/linux-fb/gdkdrawable-fb2.c diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index f7811d899e..1c8c19bac7 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -2858,6 +2858,8 @@ gdk_window_set_icon_list (GdkWindow *window, GDK_WINDOW_XID (window), gdk_x11_get_xatom_by_name ("_NET_WM_ICON")); } + + g_free (data); } /** diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index 87af04de7d..e504d32f7f 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -67,6 +67,7 @@ enum { static void gtk_button_class_init (GtkButtonClass *klass); static void gtk_button_init (GtkButton *button); +static void gtk_button_destroy (GtkObject *object); static void gtk_button_set_property (GObject *object, guint prop_id, const GValue *value, @@ -160,6 +161,8 @@ gtk_button_class_init (GtkButtonClass *klass) g_object_class->set_property = gtk_button_set_property; g_object_class->get_property = gtk_button_get_property; + object_class->destroy = gtk_button_destroy; + widget_class->realize = gtk_button_realize; widget_class->unrealize = gtk_button_unrealize; widget_class->map = gtk_button_map; @@ -307,6 +310,20 @@ gtk_button_init (GtkButton *button) button->depressed = FALSE; } +static void +gtk_button_destroy (GtkObject *object) +{ + GtkButton *button = GTK_BUTTON (object); + + if (button->label_text) + { + g_free (button->label_text); + button->label_text = NULL; + } + + (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); +} + static GObject* gtk_button_constructor (GType type, guint n_construct_properties, diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c index 82fdc836f2..ba04ab3af6 100644 --- a/gtk/gtktexttag.c +++ b/gtk/gtktexttag.c @@ -999,6 +999,8 @@ gtk_text_tag_set_property (GObject *object, font_desc = pango_font_description_from_string (name); set_font_description (text_tag, font_desc); + if (font_desc) + pango_font_description_free (font_desc); size_changed = TRUE; } -- 2.30.2